Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 May 2011 18:31:07 +0000 (11:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 May 2011 18:31:07 +0000 (11:31 -0700)
commit30a2791f705b8090f63f6772cfc354c5dcbb3b4b
treeb83c81220a70500e316cf1a4bc69188315ff3176
parent49b18a81a78f93dd442e9b3024af66945010ce50
parentd90cf6d4ce66daf8ccdd0de4ad412a6bab0f3ee3
Merge from trunk.